Skip to content

top-level/all-packages: misc changes to support native FreeBSD#311789

Merged
SuperSandro2000 merged 3 commits intoNixOS:masterfrom
rhelmot:freebsd-minimal3/top-level/all-packages
May 19, 2024
Merged

top-level/all-packages: misc changes to support native FreeBSD#311789
SuperSandro2000 merged 3 commits intoNixOS:masterfrom
rhelmot:freebsd-minimal3/top-level/all-packages

Conversation

@rhelmot
Copy link
Contributor

@rhelmot rhelmot commented May 14, 2024

Description of changes

part of #296581

  • autoPatchelfHook works on FreeBSD as well
  • bootstrapping perl needs bootstrapped zlib
  • fix some invocation parameters for bootstrapping coreutils
  • fix some parameters for invoking bintools and cc wrappers. related to bintools: fix wrapper build on FreeBSD native #311762
  • cyrus_sasl no longer needs its special case for FreeBSD
  • add native-libc support to libiconv-libc. This is probably not needed anymore but it doesn't hurt to have!
  • iconv-bin should use the binary from the freebsd tree
  • libuuid is provided by e2fsprogs on freebsd

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
    • x86_64-freebsd
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@alyssais alyssais self-requested a review May 15, 2024 08:09
@alyssais
Copy link
Member

libuuid is provided by e2fsprogs on freebsd

Can you explain this some more? Can we not use the same libuuid implementation as on Linux? (util-linux certainly builds a subset of itself for Darwin.)

Copy link
Member

@alyssais alyssais left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is small enough to review in a single PR, but it would still be nice if all the little independent changes in here could be separated into their own commits.

@rhelmot rhelmot force-pushed the freebsd-minimal3/top-level/all-packages branch from 977ab50 to f26d121 Compare May 17, 2024 23:12
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels May 17, 2024
@rhelmot rhelmot force-pushed the freebsd-minimal3/top-level/all-packages branch from f26d121 to 8b1cefe Compare May 18, 2024 00:03
@rhelmot
Copy link
Contributor Author

rhelmot commented May 18, 2024

I removed the libuuid diff because I determined it was not actually needed for the stdenv. If I rediscover the thing that prompted it, I'll investigate whether util-linux can satisfy it.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label May 18, 2024
@SuperSandro2000 SuperSandro2000 force-pushed the freebsd-minimal3/top-level/all-packages branch from 8b1cefe to ce149eb Compare May 19, 2024 16:45
@SuperSandro2000 SuperSandro2000 changed the base branch from staging to master May 19, 2024 16:45
@SuperSandro2000 SuperSandro2000 force-pushed the freebsd-minimal3/top-level/all-packages branch from ce149eb to 6b39c14 Compare May 19, 2024 16:46
@SuperSandro2000 SuperSandro2000 merged commit 68cf23f into NixOS:master May 19, 2024
@rhelmot rhelmot deleted the freebsd-minimal3/top-level/all-packages branch May 19, 2024 19:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants